From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 20 Mar 2014 21:10:29 +0000 (-0700)
Subject: Merge branch 'integration-tests'
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1129
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=ac69840ba5db8c6eeb17a370120f480d5d32f890;p=cargo.git

Merge branch 'integration-tests'

Conflicts:
	Makefile
	src/bin/cargo-read-manifest.rs
	src/bin/cargo-rustc.rs
	src/cargo/mod.rs
	src/cargo/util/process_builder.rs
	tests/test_cargo_compile.rs
---

ac69840ba5db8c6eeb17a370120f480d5d32f890